It's really strange. I only git add these two test files. I'll try to revert the other files to their current version.

I checked again. It seems like these two files are not modified by me. In 'master' branch, they're modified 5 months ago. However, in the branch I just created they are modified 4 months ago with the commit message made by you 'release 4.1.1'. I really have no idea why it is.

hmm. I suppose your started from a 4.1.1 checkout then. still surprises me, but fine.

let's try the following

git fetch origin
git rebase origin/master

with any luck, you won't have conflicts, and there will be only 1 commit remaining (on top of what is current master). If that works (and git diff origin/master just shows your changes only), then do

git push --force yourfork lys_stir

(replacing yourfork with how you called your fork as remote).

If it descends into a nightmare, you can do

git rebase --abort

I would then suggest to start from scratch and say

git checkout origin/master
git checkout -b lys_stir_swig
# just pick "your" commit
git cherry-pick 457681d079c5da1e167d4594f3a9444655cddfe8
git log

if that all looks fine, you can still push that to this PR (somewhat confusingly) by doing

git push --force yourfork lys_stir_swig:lys_stir

Or as opposed to doing the cherry-pick, you can just copy the files of course, and just create a new PR.

Abandoned in favour of #929